Merged.
authoremellor@ewan <emellor@ewan>
Fri, 7 Oct 2005 12:34:45 +0000 (13:34 +0100)
committeremellor@ewan <emellor@ewan>
Fri, 7 Oct 2005 12:34:45 +0000 (13:34 +0100)

Trivial merge